Restructuring

Now supports multiple elements and restructured the files for
simplicity.