Client: updated app folder structure (experimental), updated gruntfile for new folder structure, tested locally