Restructure

Fixed naming CamelCase issue that was going to cause a train wreck later
on