Change structure

Changed structure for easier management