Moved plugin.java and added package