Expanded Structure

Expanded the structure and moved files as needed for organization in
repository