Redone without classes
Removed old files