First version working
Moved source into separate directory