refactoring - keep all files in one directory to make it more transparent