Cleaned and moved stuff