Improved package structure, made src files reflect package structure in line with convention.