Remove/Comment out debug/disfunctional code
Add entity
Move source to separate directory