Cleaned up folders a bit