Changed directory structure and updated API adding window a bit
Changed directory structure and updated API adding window a bit