Prepare for hardware

also more organization