Restructure into a modern app