fix package structure to mvc structure