tidying file structure and grunt tasks