Renamed and moved stuff, ready for testing

MAKE BACKUPS AND EDIT THOSE