New implementation
Removed unnecessary files