Moved all interfaces and strategies to folders