refactoring package name & add remove alarm screen