Version 0.4.0 update

Structure updates and removing the old temp structures that were put in
when I first started