Updates folder names, removes main.js, adds main(OOP).js