Moved external code to different areas