change folder/package structure to match MVP design