new folder structure, moved to grunt