Re:structure Issue Six
compilation