commit cleaned up project

cleaned up all project to have it easier to manage and refactor