Static files includes moved to separate files