Improve filestructure. Prepare for building.