Reworked Structure

Updated everything