Folder restructure

Restructured project folders--all classes are grouped into appropriate
class libraries