added initial files
after refactoring
some cleanup
Cleanup