Removed Modules and modified header