Updating / optimising code and moving vallers stuff into a single directory