Re-organize repository