Move sass into _sass folder
Clean up some sass