Layer separation in a few components

Testing first proposal for Flavors. Separation of presentational layer into new files under each flavor.