Added unit folder and made some naming changes