moving the code from src to the base folder again