Changed project structure and added info bar