Changed file structure, fixed css not loading