Reorganized into src folder and finished part2