Added test folders, more architecture