Rearanged the main file structure and began changing the architecture within the basic plugins.