New File Structure

New File Structure as of 21/05/14