Removed need for struct subfolder, can now initialize anywhere