changed to proper directory structure with main and test folders