File structure reorganization & grunt integration