move files around
fix constant problem