Moved index out of public folder & few code updates