Cleanup

Fixed folder organization