Folder restructuring
Removed unused constructor
Added utility system type