Changed folder structure and added test projects