Fixed a bunch of stuff and reorganized module structure, TODO: Fix SQL Errors