Reordered file structure, fixed resulting problems and correct a mistake I had fixed on production server, but forgot to push