Added new static format, restructured files