Restructure

[Dilden]

The current structure of the files doesn't make much sense. Variables that control containers are found in a file specific to the host. Suggest restructuring the entire project. It would greatly simplify things if roles and handlers were included.