Restructured package totally, renamed project and app.