Moving code in /src folder