broken!!! + removed /architecture/buildr subpath + restructered a bit