Restructured the repository and cleaned up the code