Added part two and changed file structure