Added sidebar and cleaned up file structure