Initial commit
Moved and added some code
removed unused files