Moving stuff out of base directory