cleanup and moving stuff in the right place