Started to move methods into Entity class
Moved things to assets folder