CLEANING Gruntfile and finalizing app architecture