Finishing up assemble task and tweaking directories