refactores import
recommended file layout