Reorganized Classes

Now Class for each Flyout