Moved entity and layer related modules into module folders.