redo file structure to prepare for grunt