Refactored to match standard github layout