Improve separation of concerns in bootstrapping
Improve file listing