Code reorganization

Makefile adjustments, switch to Bochs