Changed file hierarchy. Added authorization