Fixed Issues and structure