Moved all contrib modules into contrib subdirectory