move components back to base directory