changed directory structure to make it more lofical