Bug fixes; Folder Organization; Minor Style Changes

Includes recent changes from Angelo and I. Links were broken after the last commit.

Has been tested, works as intended. 

See below commits for more info.