moving files to more sensible locations
use auto-dependencies