Got the base types organised into different folders.