Sorted out inner project structures