A more logical placement
Updated readme & changelog