Adding skeletons, refining project structure