Add thick main class
Move thin apps to new package