Moved headers to comply with typical project structure