removed entities.js, moved classes into seperate files
Fixed merge problemos
Changed filenames