Changed folder structure

Folder structure has been changed to accomodate clients.