Now doing the cleanup for the source tree. Everything a lot cleaner now, file organization wise