source code shuffle, entities have better namespace and folder structure