Solved problem 2
Restructure folder structure