refactor
move files
relative paths
simplify