Cleaned up the folders, and added grunt/compass