code refactoring - better folder structure