Cleaned the repository by moving some of the staff stuff into the same folder