done rearranging structure of src packages