Reorganizing code into different folders