#25 Rename files, improve design, remove features