Started to re-organise files into package folders