Removed test files, renamed code files