keep credits - rename namespace - change structure