Initial commit with proposed structure