Adjusted project structure; added components