moved files and cleanup
Small cleanup