Changing file structure, add folder for unit testing