Restructure

similar to what I use within classjs-plugins