Updated: moved some code to repositories