Fixing project structure some more, skeleton