Reorganized the code into proper folders