New Structure

Implemented Modularity