Bugfix + comments

> Fixed bug where static files wouldn’t get server properly
> Added comments with TODO’s and guidelines to refactor some of the
modules…