Working version of project

Working and final version of project, this will need some refactoring as
now it was just copied form Eclipse workspace.