a bit better bootstraping and directory structure