Work on static files. Also some structural changes to solution.