Folder sturcture tidied. Unit test configured