restructure source directory