Restructured project folder
more restructuring