restructuring folders in prep for grunt