Rearranged files to structure understood by Salt

This is first draft, that will change