Clean up and moved to new dir