cleaned up directories
added more testing components.