Cleaned up the file system for better managibility...requested by Weeam.