Deleted unnecessary files. Refactoring. Bugfixing.