Initial refactoring

Tested with Drupal 6 and 7 clean.

Never succeeded in getting test-kitchen to run. What are the install steps? (Maybe put em in README.md under testing)

Please test with an existing project and merge.