Cleaned up the article meta box
Moved templates back to the templates folder.