Cleaning Repo

Severe changes in the repo, need to clean this s****