Revision 1.1

Restructure and streamline