Dir. Rework and General Clean-up (Tested Working)

Also some Lib updates