codestyle and cat optimization
renaming files