Updated structure, should be complete now