Improve project structure

Also prepare for 2D intergration