refactor file structure, update gruntfile