added new elements, restructured system files