simplifying naming and directories structure