Adjusted project structure and added the most necessary bits