updated package and app name, started working on in package layout

package layout is terrible right now, I will fix it for the next commit