moved source files and improved program