Reorganize project / tweak Dockerfile