Cleaned up base file structure