restructuring folders to match bundle layout