Cleaned up the base folder
[ci skip]