updated the project structure and put the code through a compiler to fix compile-time errors
fixed a conflict I caused myself