REFACTOR: merging and cleaning.

I've merged the directories, and cleaned them too. Now, there should not
be any un-necessary file there.