Changed name of code folder, refectored as appropriate