Removed old files. Implemented soultions