Reworked File Structure
added to the framework