Cleaned up source tree for Aidaros project