Reorganized code into new folders