changed project structure; improvements regarding memory cohererence