Merge directories

Should implement #12