Updated so that static files can be separated!