Restructure to adhere to MediaWiki extenstion conventions