Initial Changes

These are the initial changes in file structure and the code