Reorganized basic project structures. No renamings yet.