Removed upwards loading logic, moved some files around