Moved things around to get a proper folder structure

Moving things around to get better folder structure


`.decomposition.decomposition` - is that better? :)