Re-organized repository