Reorganised some files and added in a lock system for the players during collision, still not fully functioning
Removal of some magic numbers