Refactoring

Moved old files to V1