Restructured project to standard layout