Clean and reorganize reposistory