Restructured Project into folders