Refactored package structure to make it less complicated, removed outdated IO code