ticket:5 change folder structure, PEP8