Changed directory structure to have src and test at the root