Simplify naming convention and directory structure