new src file layout (warning: doesnt compile by now!)