Reorganised folders, changed to use grunt