Restructured project files a bit