Massive restructure so common files are shared

Saves me time and effort