More bugfixes. Changed namespaces of entities into their current folder locations.