Moved files out of static