Clean up some florders

Removed some florders