Updated Version + Reworked Directory