Change Structur and add Modules again