started rewrite of functionality
remove old files