Moved files into src/ folder