Modified project folder structure to make pythonic and fixed tests