Plugin moved to 'plugin' folder, added tests for the some build variation