Modifications to class structure
Final Commit for Version 0.1