Restructured entity handling, added server folder