Changed package name, removed excess comments in main layout