Better structure to allow for web server and directory watching