Moved source files
Big refactor