core update (6.1b)

- folder restructure