* Reworked project layout * adjusted Makefile for new folder structure * fixed path errors * Fixed test import paths * fixes * only pushing image to the docker hub if the branch is master