Restructuring file layout and projects