0.3.0
Class: restructuring and dead code elimitation