Updating project structure and testing repo