Redid namespace structure
Got autoloading working