Directory Structure (2) & Main Split

Fixed a small bug from the first directory structure commit.
Moved the initialization code into "Main" which is necessary for future
test code.