resources bug fixed
package structure refactored