Fixed border bound bug!
Fixed the border bug once and for all!

I also did some more package reorganization!