Fixes, Reorganized some files, and some tweaks!