Removed and removed necessary files - nice refatoring